bitkeeper revision 1.1236.1.196 (424db561VR_6nEc21FjFYEo8bC8SkQ)

ia64: catch up with latest -unstable

diff --git a/xen/arch/ia64/Makefile b/xen/arch/ia64/Makefile
index b826c83b8b9e291bfff9001dc2e76ba64a1c7e12..a6becc9ac5f437dabedd381815f68587acba7b5f 100644 (file)
--- a/xen/arch/ia64/Makefile
+++ b/xen/arch/ia64/Makefile
@@ -6,7 +6,7 @@ OBJS = xensetup.o setup.o time.o irq.o ia64_ksyms.o process.o smp.o \
        xenmisc.o pdb-stub.o acpi.o hypercall.o \
        machvec.o dom0_ops.o domain.o \
        idle0_task.o pal.o hpsim.o efi.o efi_stub.o ivt.o mm_contig.o \
-       sal.o cmdline.o mm_init.o tlb.o \
+       sal.o cmdline.o mm_init.o tlb.o smpboot.o \
        extable.o linuxextable.o \
        regionreg.o entry.o unaligned.o privop.o vcpu.o \
        irq_ia64.o irq_lsapic.o hpsim_irq.o vhpt.o xenasm.o dom_fw.o

diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h
index 2879cf5829becaf4d3b5d4fe2f72b27e2766bca0..473d3f2c66e5cfceedc0b034eb44c1b5b39ee4b5 100644 (file)
--- a/xen/include/asm-ia64/config.h
+++ b/xen/include/asm-ia64/config.h
@@ -217,6 +217,10 @@ void sort_main_extable(void);
 #define ARCH_HAS_EXEC_DOMAIN_MM_PTR
 
 // see arch/x86/nmi.c !?!?
+
+// these declarations got moved at some point, find a better place for them
+extern int opt_noht;
+extern int ht_per_core;
 extern unsigned int watchdog_on;
 
 // xen/include/asm/config.h